Fix reversed > that was causing Home to go to end of previous line.

Tue Nov 14 20:13:06 2000  Owen Taylor  <otaylor@redhat.com>

	* gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): Fix
	reversed > that was causing Home to go to end of previous line.

	* gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): Ignore
	modified-keypresses (leave for bindings.)

	* modules/input/Makefile.am: Remove useless -export-dynamic
	from module LDFLAGS.

diff --git a/ChangeLog b/ChangeLog
index 11e06bc5a920e53db626a75e89478c1510774705..ac62cf29e3680a2fc6eaf371a454e8b2fa658096 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+Tue Nov 14 20:13:06 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): Fix
+       reversed > that was causing Home to go to end of previous line.
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): Ignore
+       modified-keypresses (leave for bindings.)
+
+       * modules/input/Makefile.am: Remove useless -export-dynamic
+       from module LDFLAGS.
+
 2000-11-14  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkpango.c (gdk_draw_layout_line): Draw underlines one pixel

diff --git a/ChangeLog.pre-2-0 b/ChangeLog.pre-2-0
index 11e06bc5a920e53db626a75e89478c1510774705..ac62cf29e3680a2fc6eaf371a454e8b2fa658096 100644 (file)
--- a/ChangeLog.pre-2-0
+++ b/ChangeLog.pre-2-0
@@ -1,3 +1,14 @@
+Tue Nov 14 20:13:06 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): Fix
+       reversed > that was causing Home to go to end of previous line.
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): Ignore
+       modified-keypresses (leave for bindings.)
+
+       * modules/input/Makefile.am: Remove useless -export-dynamic
+       from module LDFLAGS.
+
 2000-11-14  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkpango.c (gdk_draw_layout_line): Draw underlines one pixel

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 11e06bc5a920e53db626a75e89478c1510774705..ac62cf29e3680a2fc6eaf371a454e8b2fa658096 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,14 @@
+Tue Nov 14 20:13:06 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): Fix
+       reversed > that was causing Home to go to end of previous line.
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): Ignore
+       modified-keypresses (leave for bindings.)
+
+       * modules/input/Makefile.am: Remove useless -export-dynamic
+       from module LDFLAGS.
+
 2000-11-14  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkpango.c (gdk_draw_layout_line): Draw underlines one pixel

diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2
index 11e06bc5a920e53db626a75e89478c1510774705..ac62cf29e3680a2fc6eaf371a454e8b2fa658096 100644 (file)
--- a/ChangeLog.pre-2-2
+++ b/ChangeLog.pre-2-2
@@ -1,3 +1,14 @@
+Tue Nov 14 20:13:06 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): Fix
+       reversed > that was causing Home to go to end of previous line.
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): Ignore
+       modified-keypresses (leave for bindings.)
+
+       * modules/input/Makefile.am: Remove useless -export-dynamic
+       from module LDFLAGS.
+
 2000-11-14  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkpango.c (gdk_draw_layout_line): Draw underlines one pixel

diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4
index 11e06bc5a920e53db626a75e89478c1510774705..ac62cf29e3680a2fc6eaf371a454e8b2fa658096 100644 (file)
--- a/ChangeLog.pre-2-4
+++ b/ChangeLog.pre-2-4
@@ -1,3 +1,14 @@
+Tue Nov 14 20:13:06 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): Fix
+       reversed > that was causing Home to go to end of previous line.
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): Ignore
+       modified-keypresses (leave for bindings.)
+
+       * modules/input/Makefile.am: Remove useless -export-dynamic
+       from module LDFLAGS.
+
 2000-11-14  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkpango.c (gdk_draw_layout_line): Draw underlines one pixel

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 11e06bc5a920e53db626a75e89478c1510774705..ac62cf29e3680a2fc6eaf371a454e8b2fa658096 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,3 +1,14 @@
+Tue Nov 14 20:13:06 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): Fix
+       reversed > that was causing Home to go to end of previous line.
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): Ignore
+       modified-keypresses (leave for bindings.)
+
+       * modules/input/Makefile.am: Remove useless -export-dynamic
+       from module LDFLAGS.
+
 2000-11-14  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkpango.c (gdk_draw_layout_line): Draw underlines one pixel

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 11e06bc5a920e53db626a75e89478c1510774705..ac62cf29e3680a2fc6eaf371a454e8b2fa658096 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,14 @@
+Tue Nov 14 20:13:06 2000  Owen Taylor  <otaylor@redhat.com>
+
+       * gtk/gtktextlayout.c (gtk_text_layout_move_iter_to_line_end): Fix
+       reversed > that was causing Home to go to end of previous line.
+
+       * gtk/gtkimcontextsimple.c (gtk_im_context_simple_filter_keypress): Ignore
+       modified-keypresses (leave for bindings.)
+
+       * modules/input/Makefile.am: Remove useless -export-dynamic
+       from module LDFLAGS.
+
 2000-11-14  Havoc Pennington  <hp@redhat.com>
 
        * gdk/gdkpango.c (gdk_draw_layout_line): Draw underlines one pixel

diff --git a/gtk/gtkimcontextsimple.c b/gtk/gtkimcontextsimple.c
index a01c85c3bd57a82b038bfb8fed512dd821303373..1c56d5204f4db7f549eed55fbc45d7c24556f35e 100644 (file)
--- a/gtk/gtkimcontextsimple.c
+++ b/gtk/gtkimcontextsimple.c
@@ -20,6 +20,7 @@
 #include <stdlib.h>
 
 #include <gdk/gdkkeysyms.h>
+#include "gtkaccelgroup.h"
 #include "gtksignal.h"
 #include "gtkimcontextsimple.h"
 
@@ -915,7 +916,6 @@ check_table (GtkIMContextSimple    *context_simple,
   return FALSE;
 }
 
-
 static gboolean
 gtk_im_context_simple_filter_keypress (GtkIMContext *context,
                                       GdkEventKey  *event)
@@ -927,11 +927,15 @@ gtk_im_context_simple_filter_keypress (GtkIMContext *context,
   int n_compose = 0;
   int i;
 
-  /* Ignore modifier key presses
+  /* Ignore modifier key presses, and any presses with modifiers set
    */
   for (i=0; i < G_N_ELEMENTS (gtk_compose_ignore); i++)
     if (event->keyval == gtk_compose_ignore[i])
       return FALSE;
+
+  if (event->state &
+      (gtk_accelerator_get_default_mod_mask () & ~GDK_SHIFT_MASK))
+    return FALSE;
   
   /* Then, check for compose sequences
    */

diff --git a/gtk/gtktextlayout.c b/gtk/gtktextlayout.c
index d8eed0c7e8814e5b3bc7e85eebd795b0b82ba4f3..fe0cb36fa12f1fe3fda001288b2a706c9895e222 100644 (file)
--- a/gtk/gtktextlayout.c
+++ b/gtk/gtktextlayout.c
@@ -2511,7 +2511,7 @@ gtk_text_layout_move_iter_to_line_end (GtkTextLayout *layout,
           * to next line on a forced break not at whitespace. Real fix
           * is to keep track of whether marks are at leading or trailing edge?
            */
-          if (direction < 0 && layout_line->length > 0)
+          if (direction > 0 && layout_line->length > 0)
             gtk_text_iter_prev_char (iter);
 
           break;

diff --git a/modules/input/Makefile.am b/modules/input/Makefile.am
index 2a4d1166ef0eec72688b4339f77ee10756d3e85e..c05492d7f926aa8c1ef347b6ace36d83c2ffbb24 100644 (file)
--- a/modules/input/Makefile.am
+++ b/modules/input/Makefile.am
@@ -35,16 +35,16 @@ LDADDS = @STRIP_BEGIN@                                      \
 moduledir = $(libdir)/gtk-2.0/$(GTK_VERSION)/immodules
 module_LTLIBRARIES = im-cyrillic-translit.la im-xim.la im-viqr.la im-thai-broken.la
 
-im_cyrillic_translit_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
+im_cyrillic_translit_la_LDFLAGS = -rpath $(libdir) -avoid-version -module
 im_cyrillic_translit_la_SOURCES = imcyrillic-translit.c
 
-im_thai_broken_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
+im_thai_broken_la_LDFLAGS = -rpath $(libdir) -avoid-version -module
 im_thai_broken_la_SOURCES = imthai-broken.c
 
-im_viqr_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
+im_viqr_la_LDFLAGS = -rpath $(libdir) -avoid-version -module
 im_viqr_la_SOURCES = imviqr.c
 
-im_xim_la_LDFLAGS = -rpath $(libdir) -export-dynamic -avoid-version -module
+im_xim_la_LDFLAGS = -rpath $(libdir) -avoid-version -module
 im_xim_la_SOURCES =            \
        gtkimcontextxim.c       \
        gtkimcontextxim.h       \